imagemagick merge
authorjoakim@verona.se <>
Fri, 20 Aug 2010 20:01:27 +0000 (22:01 +0200)
committerjoakim@verona.se <>
Fri, 20 Aug 2010 20:01:27 +0000 (22:01 +0200)

Trivial merge